diff --git a/build.sh b/build.sh
deleted file mode 100755
index 7209e050..00000000
--- a/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-set -x
-
-nix-build \
-    --no-out-link \
-    --pure \
-    "${@}"
-
-exit 0
diff --git a/configurations/direnv.nix b/configurations/direnv.nix
index 2fc3cea4..f48fa0e3 100644
--- a/configurations/direnv.nix
+++ b/configurations/direnv.nix
@@ -18,7 +18,7 @@
         use_flake() {
           watch_file flake.nix
           watch_file flake.lock
-          eval "$(nix --experimental-features 'nix-commnand flakes' print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
+          eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
         }
       '';
     };
diff --git a/configurations/nix-store.nix b/configurations/nix-store.nix
index cbf32ec0..0fe11c2b 100644
--- a/configurations/nix-store.nix
+++ b/configurations/nix-store.nix
@@ -5,14 +5,6 @@
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
-    package = pkgs.nixUnstable.overrideAttrs (oldAttrs: {
-      src = pkgs.fetchFromGitHub {
-        owner = "NixOS";
-        repo = "nix";
-        rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940";
-        hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0=";
-      };
-    });
     gc = {
       automatic = true;
       dates = "hourly";
@@ -25,6 +17,19 @@
     trustedUsers = [ "@wheel" ];
   };
 
+  nixpkgs.overlays = [
+    (self: super: {
+      nix = super.nixUnstable.overrideAttrs (oldAttrs: {
+        src = self.fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940";
+          hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0=";
+        };
+      });
+    })
+  ];
+
   nixpkgs.config = import ./nix-store/config.nix;
 
   home-manager.users.charlotte = { ... }: {
diff --git a/flake.nix b/flake.nix
index 9e95f0db..30cda2c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,11 +30,7 @@
       in
       {
         devShell = pkgs.mkShell {
-          buildInputs = with nixpkgs.legacyPackages.${system}; [
-            jq
-            nixUnstable
-            nixpkgs-fmt
-          ];
+          buildInputs = with nixpkgs.legacyPackages.${system}; [ nixpkgs-fmt ];
         };
       }) // {
       nixosConfigurations = {
diff --git a/shells/nix.nix b/shells/nix.nix
deleted file mode 100644
index 330df0ab..00000000
--- a/shells/nix.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
-  src = ./.;
-}).shellNix
diff --git a/substituterbuild.sh b/substituterbuild.sh
deleted file mode 100755
index 1fa37e20..00000000
--- a/substituterbuild.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-set -x
-
-BUILD_ARGS=("--secret-key-files" "/etc/nix/key.private")
-for machine in machines/*
-do
-    output=$(./build.sh "${BUILD_ARGS[@]}" "$machine")
-    nix-env --set -p /nix/var/nix/profiles/per-user/charlotte/${machine#machines/} $output
-done
diff --git a/update.sh b/update.sh
index 6cc0561b..de87deb3 100755
--- a/update.sh
+++ b/update.sh
@@ -2,16 +2,22 @@
 set -euo pipefail
 set -x
 
-./update-imports.sh
+nix flake update
 
 BUILD_ARGS=(
     "--builders"
     "ssh://charlotte@sunspear.vanpetegem.me"
+    "--builders-use-substitutes"
     "--extra-substituters"
     "ssh://charlotte@sunspear.vanpetegem.me"
     "--trusted-public-keys"
     "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= sunspear-nix-cache:4mgL4qS7EweCug1gAFiZKgQK+xuoJMBYThIUE+kPX4s="
 )
-result="$(./build.sh "${BUILD_ARGS[@]}" "./machines/$(hostname)")"
 
-sudo bash -c "nix-env --set --profile /nix/var/nix/profiles/system/ ${result} && ${result}/bin/switch-to-configuration switch"
+if [ -d "../nixpkgs" ]
+then
+    BUILD_ARGS+=("--override-input" "nixpkgs" "../nixpkgs")
+fi
+
+sudo nix build --profile /nix/var/nix/profiles/system ".#nixosConfigurations.$(hostname).config.system.build.toplevel" --no-link "${BUILD_ARGS[@]}" && \
+    sudo nix --experimental-features "nix-command flakes" shell -vv /nix/var/nix/profiles/system -c switch-to-configuration switch