diff --git a/lib/default.nix b/lib/default.nix
index e9a6abb5..cfa83505 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -44,9 +44,10 @@
     gpu       ? null, 
     theme     ? "default"
   }: {
+    libx = import . { inherit inputs outputs stateVersion hmStateVersion; };
     specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme; };
-    hostname = mkHost { hostname = hostname; platform = platform; installer = installer; };
-    "$username@$hostname" = mkHome { hostname = hostname; platform = platform; };
+    hostname = libx.mkHost { hostname = hostname; platform = platform; installer = installer; };
+    "$username@$hostname" = libx.mkHome { hostname = hostname; platform = platform; };
   };
 
   forAllSystems = inputs.nixpkgs.lib.genAttrs [