diff --git a/flake.lock b/flake.lock
index 7e007b0..c9a7772 100644
--- a/flake.lock
+++ b/flake.lock
@@ -96,6 +96,27 @@
         "type": "github"
       }
     },
+    "home-manager-unstable": {
+      "inputs": {
+        "nixpkgs": [
+          "unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683459775,
+        "narHash": "sha256-Ab1pIKOj7XRZbJAv4g9937ElhaZF7Pob3hqGTDKt5w8=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "6fc82e56971523acfe1a61dbcb20f4bb969b3990",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "homepage": {
       "flake": false,
       "locked": {
@@ -284,6 +305,7 @@
         "deploy-rs": "deploy-rs",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "home-manager-unstable": "home-manager-unstable",
         "homepage": "homepage",
         "hyprland": "hyprland",
         "hyprpaper": "hyprpaper",
diff --git a/flake.nix b/flake.nix
index e5df4e4..b0136a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,11 @@
       inputs.nixpkgs.follows = "unstable";
     };
 
+    home-manager-unstable = {
+      url = "github:nix-community/home-manager/master";
+      inputs.nixpkgs.follows = "unstable";
+    };
+
     homepage = {
       url = "github:JulienMalka/homepage";
       flake = false;
@@ -86,6 +91,7 @@
           modules = self.nixosModules;
           nixpkgs = lib.luj.machines.${name}.nixpkgs_version;
           system = lib.luj.machines.${name}.arch;
+          home-manager = lib.luj.machines.${name}.hm_version;
         }))
         (lib.importConfig ./machines);
 
diff --git a/lib/default.nix b/lib/default.nix
index 90fbafb..4a3e339 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -9,7 +9,7 @@ let
 in
 {
 
-  mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux" }: nixpkgs.lib.nixosSystem {
+  mkMachine = { host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }: nixpkgs.lib.nixosSystem {
     lib = final;
     system = system;
     specialArgs = {
@@ -19,7 +19,7 @@ in
       ../base.nix
       inputs.sops-nix.nixosModules.sops
       host-config
-      inputs.home-manager.nixosModules.home-manager
+      home-manager.nixosModules.home-manager
       inputs.simple-nixos-mailserver.nixosModule
       inputs.hyprland.nixosModules.default
       {
diff --git a/lib/luj.nix b/lib/luj.nix
index c8c50e0..2c2a4f5 100644
--- a/lib/luj.nix
+++ b/lib/luj.nix
@@ -27,22 +27,27 @@ inputs: lib: with lib; let
           lisa = {
             arch = "x86_64-linux";
             nixpkgs_version = inputs.nixpkgs;
+            hm_version = inputs.home-manager;
           };
           newton = {
             arch = "x86_64-linux";
             nixpkgs_version = inputs.nixpkgs;
+            hm_version = inputs.home-manager;
           };
           macintosh = {
             arch = "aarch64-linux";
             nixpkgs_version = inputs.nixos-apple-silicon.inputs.nixpkgs;
+            hm_version = inputs.home-manager-unstable;
           };
           lambda = {
             arch = "aarch64-linux";
             nixpkgs_version = inputs.nixpkgs;
+            hm_version = inputs.home-manager;
           };
           tower = {
             arch = "x86_64-linux";
             nixpkgs_version = inputs.nixpkgs;
+            hm_version = inputs.home-manager;
           };
 
         };