diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix
index 3f84df39..38d0d479 100644
--- a/nix/configurations/hetzner_benchmark.nix
+++ b/nix/configurations/hetzner_benchmark.nix
@@ -44,6 +44,8 @@ in
         ];
       };
 
+      nix.package = pkgs.nix-monitored;
+
       system.nixos =
         let
           rev = lib.substring 0 8 sources.nixpkgs.revision;
@@ -57,7 +59,6 @@ in
     ./hetzner_benchmark/nixos/hardware-configuration.nix
     ./hetzner_benchmark/nixos/misc.nix
     ./hetzner_benchmark/nixos/programs.nix
-    ./hetzner_benchmark/nixos/builder.nix
 
     ../nixosModules/common/fish.nix
     ../nixosModules/common/disable-command-not-found.nix
diff --git a/nix/configurations/hetzner_benchmark/nixos/builder.nix b/nix/configurations/hetzner_benchmark/nixos/builder.nix
deleted file mode 100644
index c8191c8d..00000000
--- a/nix/configurations/hetzner_benchmark/nixos/builder.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# https://nix.dev/tutorials/nixos/distributed-builds-setup.html
-{ config, ... }:
-{
-  users.users.remotebuild = {
-    isSystemUser = true;
-    group = "remotebuild";
-    useDefaultShell = true;
-
-    openssh.authorizedKeys.keys = config.users.users.root.openssh.authorizedKeys.keys;
-  };
-
-  users.groups.remotebuild = { };
-  nix = {
-    nrBuildUsers = 64; # defaults to 32
-    settings = {
-      trusted-users = [ "remotebuild" ];
-
-      min-free = 50 * 1024 * 1024 * 1024; # start gc when < 10 GB is available
-      max-free = 100 * 1024 * 1024 * 1024; # stop gc when 20 GB is available
-
-      max-jobs = "auto";
-      cores = 0;
-    };
-  };
-
-  systemd.services.nix-daemon.serviceConfig = {
-    MemoryAccounting = true;
-    MemoryMax = "90%";
-    OOMScoreAdjust = 500;
-  };
-}
diff --git a/nix/configurations/hydrogen.nix b/nix/configurations/hydrogen.nix
index 2cafb757..42554878 100644
--- a/nix/configurations/hydrogen.nix
+++ b/nix/configurations/hydrogen.nix
@@ -41,6 +41,7 @@ in
         overlays = map import [
           ../overlays/agenix.nix
           ../overlays/nur.nix
+          ../overlays/nix-tree.nix
           ../packages/overlay.nix
 
           # use lix everywhere and wrap it with nom
@@ -49,6 +50,8 @@ in
         ];
       };
 
+      nix.package = pkgs.nix-monitored;
+
       system.nixos =
         let
           rev = lib.substring 0 8 sources.nixpkgs.revision;
diff --git a/nix/configurations/installer.nix b/nix/configurations/installer.nix
index 027168d7..972409e9 100644
--- a/nix/configurations/installer.nix
+++ b/nix/configurations/installer.nix
@@ -38,6 +38,7 @@ in
       ../overlays/agenix.nix
       ../overlays/disko.nix
       ../overlays/nur.nix
+      ../overlays/nix-tree.nix
 
       ../packages/overlay.nix
     ];
diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index aeb22f45..acdb6d98 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -52,6 +52,7 @@ in
           ../overlays/disko.nix
           ../overlays/nur.nix
           ../overlays/wired-notify.nix
+          ../overlays/nix-tree.nix
           ../overlays/wallpapers.nix
           ../overlays/nil.nix
           ../overlays/dix.nix
@@ -70,7 +71,6 @@ in
 
           # use lix everywhere and wrap it with nom
           ../overlays/lix.nix
-          ../overlays/nix-monitored.nix
         ];
       };
 
@@ -88,7 +88,6 @@ in
     # NixOS modules
     #
     ./vanadium/nixos/hardware-configuration.nix # generated
-    ./vanadium/nixos/sane-nix.nix
     ./vanadium/nixos/fs.nix
     ./vanadium/nixos/restic.nix
 
diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix
index 0eac0247..f011127d 100644
--- a/nix/configurations/vanadium/home/programs.nix
+++ b/nix/configurations/vanadium/home/programs.nix
@@ -79,7 +79,6 @@
     pkgs.niv
     pkgs.npins
     pkgs.nix-tree
-    pkgs.nix-output-monitor
     pkgs.nh
 
     # productivity / media
diff --git a/nix/configurations/vanadium/nixos/sane-nix.nix b/nix/configurations/vanadium/nixos/sane-nix.nix
deleted file mode 100644
index 83c080d8..00000000
--- a/nix/configurations/vanadium/nixos/sane-nix.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# Protect my system from running out of storage or memory
-{
-  nix.settings = {
-    min-free = 50 * 1024 * 1024 * 1024;
-    max-free = 100 * 1024 * 1024 * 1024;
-  };
-
-  systemd.services.nix-daemon.serviceConfig = {
-    MemoryAccounting = true;
-    MemoryMax = "90%";
-    OOMScoreAdjust = 500;
-  };
-}
diff --git a/nix/identities.nix b/nix/identities.nix
index 4e561f7d..1859f241 100644
--- a/nix/identities.nix
+++ b/nix/identities.nix
@@ -1,7 +1,6 @@
 [
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium"
-  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcIprcqvTCicHdtn9GFM77n7fTzhG0/nAEqMp5n6W+m root@vanadium"
-  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5OgvihLpGaenFmZpbflF+UFsyYTZDwBZqTmSYdquC3 root@vanadium" # host
+  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5OgvihLpGaenFmZpbflF+UFsyYTZDwBZqTmSYdquC3 root@vanadium"
 
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXzNdCA0zZ+WmeKZnhQSQtUcxnQhhDl59E3BPQfLj7Q leana@hydrogen"
   "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMVDmEt/12u9U4QGDZBx/Sx8itzqfQ4zWJvcC3pRZqP root@hydrogen"
diff --git a/nix/overlays/nix-monitored.nix b/nix/overlays/nix-monitored.nix
index c01747aa..28f696bb 100644
--- a/nix/overlays/nix-monitored.nix
+++ b/nix/overlays/nix-monitored.nix
@@ -1,32 +1,10 @@
 let
   sources = import ../../npins;
 in
-final: prev:
-let
-  nix-monitored =
-    sources.nix-monitored.asFlake.packages.${final.stdenv.hostPlatform.system}.default.override
-      {
-        inherit (final)
-          nix # Use the nix the user wants, whether it's lix or nix
-          nix-output-monitor # don't use the nom pinned by nix-monitored
-          ;
-        withNotify = false;
-      };
-
-  keepNixOverride =
-    drv:
-    drv
-    // {
-      override = args: drv.override (builtins.removeAttrs args [ "nix" ]);
-    };
-in
-{
-  nixos-rebuild-ng = keepNixOverride (
-    prev.nixos-rebuild-ng.override {
-      nix = nix-monitored;
-    }
-  );
-  nix-direnv = prev.nix-direnv.override {
-    nix = nix-monitored;
+# The final nix is lix in this case
+final: prev: {
+  nix-monitored = sources.nix-monitored.asFlake.packages.${final.stdenv.hostPlatform.system}.default.override {
+    inherit (final) nix;
+    withNotify = false; # noisy, spams "command completed" even for nix shells
   };
 }
diff --git a/nix/overlays/nix-tree.nix b/nix/overlays/nix-tree.nix
new file mode 100644
index 00000000..ec23e3c2
--- /dev/null
+++ b/nix/overlays/nix-tree.nix
@@ -0,0 +1,8 @@
+# The one in nixpkgs doesn't work
+# Getting nix-tree: user error (Failed parsing nix path-info output.)
+let
+  sources = import ../../npins;
+in
+final: _: {
+  nix-tree = (import sources.nix-tree).packages.${final.stdenv.hostPlatform.system}.default;
+}
diff --git a/npins/sources.json b/npins/sources.json
index 9a81a007..c3f6319c 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -162,6 +162,22 @@
       "hash": "1rdyjmxkvyqd5blbzbwfv2b99krx6rkpdzi1ckyby8i676gf9hv7",
       "frozen": true
     },
+    "nix-tree": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "utdemir",
+        "repo": "nix-tree"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "submodules": false,
+      "version": "v0.8.0",
+      "revision": "e7ef6623cf944b80e48196d74c6531dd79943652",
+      "url": "https://api.github.com/repos/utdemir/nix-tree/tarball/v0.8.0",
+      "hash": "1ag68xnszianrfinm56mf9bhvm0pglvnmlyffjr1pxrkji8d52nc"
+    },
     "nixos-hardware": {
       "type": "Git",
       "repository": {