diff --git a/modules/nix-tools/rebuild.nix b/modules/nix-tools/rebuild.nix
index d9c8723..8d2b195 100644
--- a/modules/nix-tools/rebuild.nix
+++ b/modules/nix-tools/rebuild.nix
@@ -43,7 +43,7 @@
       nhms = (pkgs.writeShellScriptBin "nhms" ''
         HOSTNAME=${hostnameCmd}
         ${echoCmd} "Switching to the $HOSTNAME home-manager profile"
-        ${lib.getExe pkgs.home-manager} switch --impure --flake ${flakeDir}#$HOSTNAME
+        ${lib.getExe pkgs.nh} home switch ${flakeDir} -c $HOSTNAME "$@"
       '');
     in
     {
@@ -74,8 +74,7 @@
           '')
           nhms
           (writeShellScriptBin "nhmu" ''
-            ${nixBin} flake update --flake ${flakeDir}
-            ${lib.getExe nhms}
+            ${lib.getExe nhms} --update
           '')
 
           (writeShellScriptBin "test-build" ''