diff --git a/nix/configurations/iron.nix b/nix/configurations/iron.nix
index 6be03297..6745f3a5 100644
--- a/nix/configurations/iron.nix
+++ b/nix/configurations/iron.nix
@@ -35,34 +35,37 @@ in
       nix = {
         distributedBuilds = true;
         settings.builders-use-substitutes = true;
+
+        # don't use `nixpkgs.flake.source`, it uses flake so it double fetches
+        nixPath = [ "nixpkgs=${sources.nixpkgs}" ];
       };
 
       nixpkgs = {
-        overlays =
-          map import [
-            ../overlays/agenix.nix
-            ../overlays/disko.nix
-            ../overlays/nur.nix
-            ../overlays/nix-tree.nix
-            ../overlays/nil.nix
-            ../overlays/dix.nix
+        overlays = map import [
+          ../overlays/agenix.nix
+          ../overlays/disko.nix
+          ../overlays/nur.nix
+          ../overlays/nix-tree.nix
+          ../overlays/nil.nix
+          ../overlays/dix.nix
 
-            ../packages/overlay.nix
-          ]
+          ../packages/overlay.nix
           # use lix everywhere and wrap it with nom
-          ++ [
-            (import (sources.lix-module + "/overlay.nix") { inherit (sources) lix; })
-            (import ../overlays/nix-monitored.nix)
-          ];
-
-        # Set NIX_PATH and flake registry at the same time
-        # https://github.com/NixOS/nixpkgs/pull/254405
-        flake.source = sources.nixpkgs;
+          ../overlays/lix.nix
+          ../overlays/nix-monitored.nix
+        ];
       };
 
       nix.package = pkgs.nix-monitored;
 
-      system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision;
+      system.nixos =
+        let
+          rev = lib.substring 0 8 sources.nixpkgs.revision;
+        in
+        {
+          versionSuffix = "-git:${rev}";
+          revision = rev;
+        };
     }
 
     #
diff --git a/nix/configurations/iron/nixos/connectivity.nix b/nix/configurations/iron/nixos/connectivity.nix
index 019fd2d4..7cd0abd4 100644
--- a/nix/configurations/iron/nixos/connectivity.nix
+++ b/nix/configurations/iron/nixos/connectivity.nix
@@ -4,12 +4,7 @@
   ...
 }:
 {
-  users.users.root.openssh.authorizedKeys.keys =
-    let
-      # TODO: put iron keys in identities
-      ids = import ../../../identities.nix;
-    in
-    builtins.concatMap builtins.attrValues (builtins.attrValues ids);
+  users.users.root.openssh.authorizedKeys.keys = import ../../../identities.nix;
 
   networking = {
     networkmanager.enable = lib.mkForce false;