diff --git a/flake.nix b/flake.nix
index 8f6d957..a8e9d70 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,12 @@
         };
 
       wrapUtils = { pkgs, unstable, system }:
-        import ./lib { inherit nixpkgs nixos-unstable home-manager system pkgs unstable; };
+        pkgs.lib.makeScope pkgs.newScope (self: {
+          inherit nixpkgs home-manager nixos-unstable;
+          user = self.callPackage ./lib/user.nix { };
+          host = self.callPackage ./lib/host.nix { };
+        });
+
 
       pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
       unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
diff --git a/lib/default.nix b/lib/default.nix
deleted file mode 100644
index c04300b..0000000
--- a/lib/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, unstable, nixpkgs, nixos-unstable, home-manager, system, ... }: rec {
-  user = import ./user.nix { inherit pkgs unstable system home-manager; };
-  host = import ./host.nix {
-    inherit pkgs nixpkgs unstable nixos-unstable home-manager user system;
-  };
-}