diff --git a/README.md b/README.md
index f0ad23af..c206d7f5 100644
--- a/README.md
+++ b/README.md
@@ -57,20 +57,14 @@ ln -s $PWD /etc/nixos
 # adding a new file to staging is enough:
 git add ./hosts/${new_host}.nix
 
-# A generic `rebuild` wrapper for `nix build` is provided
-# bypassing the need for `nixos-rebuild`.
-
-# Usage: rebuild [host] {switch|boot|test|dry-activate}
-# where `host` is any file living in the `./hosts` directory
-
-# Test your new deployment; this will be run as root:
-rebuild $new_host test
+# Test your new deployment:
+sudo nixos-rebuild $new_host test
 
 # You may wish to start by creating a user:
 mkdir users/new-user && $EDITOR users/new-user/default.nix
 
 # Once your satisfied, permanently deploy with:
-rebuild $new_host switch
+sudo nixos-rebuild $new_host switch
 ```
 
 Please read the [doc](DOC.md) in order to understand the impetus
@@ -80,7 +74,7 @@ behind the directory structure.
 
 ```sh
 # Make an iso image based on `./hosts/niximg.nix`:
-rebuild iso
+build-iso
 
 # Install any package the flake exports:
 nix profile install ".#packages.x86_64-linux.myPackage"
diff --git a/shell.nix b/shell.nix
index 7ff9167d..07a8ae87 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,22 +1,12 @@
 { pkgs ? import <nixpkgs> { } }:
 let
   configs = "${toString ./.}#nixosConfigurations";
-  hostname = pkgs.lib.fileContents /etc/hostname;
-  build = "config.system.build";
 
-  rebuild = pkgs.writeShellScriptBin "rebuild" ''
-    if [[ -z $1 ]]; then
-      echo "Usage: $0 [host] {switch|boot|test|iso}"
-    elif [[ $1 == "iso" ]]; then
-      nix build ${configs}.niximg.${build}.isoImage
-    elif [[ -z $2 ]]; then
-      sudo -E nix shell -vv ${configs}.${hostname}.${build}.toplevel -c switch-to-configuration $1
-    else
-      sudo -E nix shell -vv ${configs}.$1.${build}.toplevel -c switch-to-configuration $2
-    fi
+  buildIso = pkgs.writeShellScriptBin "build-iso" ''
+    nix build ${configs}.niximg.config.system.build.isoImage
   '';
 in pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [ git git-crypt nixFlakes rebuild ];
+  nativeBuildInputs = with pkgs; [ git git-crypt nixFlakes buildIso ];
 
   shellHook = ''
     mkdir -p secrets