diff --git a/lib/default.nix b/lib/default.nix
index 0dbaf1a4..2e498614 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -43,27 +43,27 @@
     type      ? "default",
     repo      ? "nixpkgs",
     unfree    ? false
-  }: inputs.${repo}.lib.nixosSystem { 
-    specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu system theme; };
-
+  }: {
     pkgs = import inputs.${repo} { 
       inherit system; 
       config.allowUnfree = unfree; 
       hostPlatform = system;
     };
-
     unstable-pkgs = import inputs.nixpkgs-unstable { 
       inherit system; 
       config.allowUnfree = unfree; 
       hostPlatform = system;
     };
 
-    modules = [
-      # Types are 'default', 'small', and 'minimal'
-      ../nixos/${type}.nix
-      inputs.sops-nix.nixosModules.sops
-      inputs.lanzaboote.nixosModules.lanzaboote
-    ];
+    inputs.${repo}.lib.nixosSystem { 
+      specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu system theme; };
+      modules = [
+        # Types are 'default', 'small', and 'minimal'
+        ../nixos/${type}.nix
+        inputs.sops-nix.nixosModules.sops
+        inputs.lanzaboote.nixosModules.lanzaboote
+      ];
+    };
   };
 
   # Combines mkHost and mkHome for image building