diff --git a/modules/nix-tools/rebuild.nix b/modules/nix-tools/rebuild.nix
index 93925f4..1b98904 100644
--- a/modules/nix-tools/rebuild.nix
+++ b/modules/nix-tools/rebuild.nix
@@ -30,6 +30,10 @@
 
         home.packages = with pkgs; [
           home-manager
+
+          #
+          # Flake-Parts checks
+          #
           (writeShellScriptBin "flake-parts-test" ''
             echo "Test ${flakeDir}"
           '')
@@ -38,6 +42,10 @@
             ${nixBin} run "${flakeDir}#write-flake"
             ${nixBin} flake check
           '')
+
+          #
+          # Home-Manager rebuilds
+          #
           (writeShellScriptBin "nhms" ''
             HOSTNAME=${hostnameCmd}
             echo "Switching to the $HOSTNAME home-manager profile"
@@ -47,16 +55,21 @@
             ${nixBin} flake update --flake ${flakeDir}
             nhms
           '')
+
+          #
+          # NixOS rebuilds
+          #
           (writeShellScriptBin "nfs" ''
             HOSTNAME=${hostnameCmd}
             echo "Switching to the $HOSTNAME nixos profile"
-            sudo ${lib.getExe pkgs.nixos-rebuild} switch --impure --flake ${flakeDir}#$HOSTNAME
+            sudo ${lib.getExe nixos-rebuild} switch --impure --flake ${flakeDir}#$HOSTNAME
           '')
-          (pkgs.writeShellScriptBin "nfsu" ''
+          (writeShellScriptBin "nfsu" ''
+            HOSTNAME=${hostnameCmd}
             ${nixBin} flake update --impure --flake ${flakeDir}
-            ${lib.getExe pkgs.git} -C ${flakeDir} add ${flakeDir}/flake.lock > /dev/null 2>&1
-            sudo ${lib.getExe pkgs.nixos-rebuild} switch --impure --flake ${flakeDir}#$HOSTNAME
-        '')
+            ${lib.getExe git} -C ${flakeDir} add ${flakeDir}/flake.lock > /dev/null 2>&1
+            sudo ${lib.getExe nixos-rebuild} switch --impure --flake ${flakeDir}#$HOSTNAME
+          '')
         ];
       };
     };