diff --git a/lib/default.nix b/lib/default.nix
index 396f95b..56a2f57 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,5 +1,5 @@
 { pkgs, unstable, nixpkgs, nixos-unstable, home-manager, ... }: rec {
-  user = import ./user.nix { inherit pkgs; };
+  user = import ./user.nix { inherit pkgs unstable; };
   host = import ./host.nix {
     inherit pkgs nixpkgs unstable nixos-unstable home-manager user;
   };
diff --git a/lib/host.nix b/lib/host.nix
index 2abd077..afae61d 100644
--- a/lib/host.nix
+++ b/lib/host.nix
@@ -31,6 +31,7 @@
         };
 
         home-manager.users.root.imports = [ ../roles/home/common.nix ];
+        home-manager.extraSpecialArgs.unstable = unstable;
       }
 
       home-manager.nixosModules.home-manager
diff --git a/lib/user.nix b/lib/user.nix
index e9254f5..4a3e40e 100644
--- a/lib/user.nix
+++ b/lib/user.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, unstable, ... }:
 
 {
   mkUser = { name, roles ? [ ] }:
@@ -19,8 +19,8 @@
         shell = pkgs.zsh;
         extraGroups = [ "wheel" "plugdev" ];
       };
-
-      home-manager.users.${name}.imports = [ ../roles/home/common.nix ]
+      
+      home-manager.users.${name}.imports = [ (mkRole "common") ]
         ++ roles_mod;
     };
 }