diff --git a/lib/default.nix b/lib/default.nix
index f40c5b19..cb357a20 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -43,18 +43,22 @@
     type      ? "default",
     repo      ? "nixpkgs",
     unfree    ? false
-  }: inputs.${repo}.lib.nixosSystem {
+  }: 
+  let
+
+    pkgs-unstable = import inputs.nixpkgs-unstable {
+      inherit system;
+      config.allowUnfree = true;
+      hostPlatform = true;
+    };
+  in {
+  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;
     };
-    pkgs-unstable = import inputs.nixpkgs-unstable {
-      inherit system;
-      config.allowUnfree = true;
-      hostPlatform = true;
-    };
 
     modules = [
       # Types are 'default', 'small', and 'minimal'
@@ -62,7 +66,7 @@
       inputs.sops-nix.nixosModules.sops
       inputs.lanzaboote.nixosModules.lanzaboote
     ];
-  };
+  };};
 
   # Combines mkHost and mkHome for image building
   mkImage = {