diff --git a/flake.lock b/flake.lock
index 6f0d3d24..a31af6ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,9 +5,11 @@
         "darwin": [
           "nix-darwin"
         ],
-        "home-manager": "home-manager",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
-          "nixpkgs"
+          "nixos-unstable"
         ]
       },
       "locked": {
@@ -103,7 +105,7 @@
     "disko": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixos-unstable"
         ]
       },
       "locked": {
@@ -294,28 +296,7 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
+          "nixos-unstable"
         ]
       },
       "locked": {
@@ -414,18 +395,18 @@
         "type": "github"
       }
     },
-    "nixos-stable": {
+    "nixos-unstable": {
       "locked": {
-        "lastModified": 1694426803,
-        "narHash": "sha256-osusXQo0zkEqs502SNMffsKp1O9evpDM54A37MuyT2Q=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9a74ffb2ca1fc91c6ccc48bd3f8cbc1501bf7b8a",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -546,11 +527,11 @@
         "disko": "disko",
         "flake-parts": "flake-parts",
         "flake-root": "flake-root",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
         "nifoc-overlay": "nifoc-overlay",
         "nix-darwin": "nix-darwin",
         "nixos-hardware": "nixos-hardware",
-        "nixos-stable": "nixos-stable",
+        "nixos-unstable": "nixos-unstable",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "treefmt-nix": "treefmt-nix"
diff --git a/flake.nix b/flake.nix
index f668c225..25711e40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixos-stable.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     # Tools
@@ -24,7 +24,7 @@
 
     disko = {
       url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-unstable";
     };
 
     nix-darwin = {
@@ -34,15 +34,18 @@
 
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixos-unstable";
     };
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     agenix = {
       url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.darwin.follows = "nix-darwin";
+      inputs = {
+        nixpkgs.follows = "nixos-unstable";
+        darwin.follows = "nix-darwin";
+        home-manager.follows = "home-manager";
+      };
     };
 
     attic = {
@@ -71,27 +74,37 @@
           };
 
           tanker = import ./system/flakes/tanker.nix {
-            inherit (inputs) nixpkgs nixos-stable disko deploy-rs home-manager agenix attic;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) disko deploy-rs home-manager agenix attic;
             inherit inputs;
           };
 
           mediaserver = import ./system/flakes/mediaserver.nix {
-            inherit (inputs) nixpkgs deploy-rs home-manager agenix;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) deploy-rs home-manager agenix;
             inherit inputs;
           };
 
           argon = import ./system/flakes/argon.nix {
-            inherit (inputs) nixpkgs nixos-hardware deploy-rs home-manager agenix;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) nixos-hardware deploy-rs home-manager agenix;
             inherit inputs;
           };
 
           weather-sdr = import ./system/flakes/weather-sdr.nix {
-            inherit (inputs) nixpkgs deploy-rs home-manager agenix;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) deploy-rs home-manager agenix;
             inherit inputs;
           };
 
           adsb-antenna = import ./system/flakes/adsb-antenna.nix {
-            inherit (inputs) nixpkgs nixos-hardware deploy-rs home-manager;
+            nixpkgs = inputs.nixos-unstable;
+
+            inherit (inputs) nixos-hardware deploy-rs home-manager;
             inherit inputs;
           };
         in
diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix
index 18b622ed..6288896e 100644
--- a/system/flakes/tanker.nix
+++ b/system/flakes/tanker.nix
@@ -1,15 +1,13 @@
-{ nixpkgs, nixos-stable, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }:
+{ nixpkgs, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }:
 
 let
   default-system = "x86_64-linux";
 
-  overlay-stable = _: _: { pkgs-stable = import nixos-stable { system = default-system; }; };
   # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
-      overlay-stable
       # overlay-master
       overlay-nifoc
     ];