diff --git a/flake.lock b/flake.lock
index 215b24c..c5e481e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,7 +212,9 @@
         "git-hooks": "git-hooks",
         "hercules-ci-effects": "hercules-ci-effects",
         "neovim-src": "neovim-src",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nix-unstable"
+        ]
       },
       "locked": {
         "lastModified": 1718687251,
@@ -277,22 +279,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1718428119,
-        "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1718437845,
         "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
@@ -315,7 +301,7 @@
         "neovim-nightly": "neovim-nightly",
         "nix-darwin": "nix-darwin",
         "nix-unstable": "nix-unstable",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "vscode-server": "vscode-server"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4323927..b429924 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
     vscode-server.url = "github:nix-community/nixos-vscode-server";
     vscode-server.inputs.nixpkgs.follows = "nixpkgs";
     neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
+    neovim-nightly.inputs.nixpkgs.follows = "nix-unstable";
   };
 
   outputs = { self, nixpkgs, nix-unstable, home-manager, darwin, nix-darwin, vscode-server, ... }@inputs:
@@ -36,6 +37,9 @@
             system = "aarch64-linux";
             config.allowUnfree = true;
             config.allowBroken = true;
+            overlays = [
+              inputs.neovim-nightly.overlays.default
+            ];
           };
         };
       };
diff --git a/modules/common.nix b/modules/common.nix
index dc814d5..9231d4c 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -89,12 +89,11 @@
   nixpkgs.overlays = [
     (import "${inputs.self}/overlays")
     (final: prev: { latest = unstable; })
-    inputs.neovim-nightly.overlays.default
   ];
 
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
-  home-manager.extraSpecialArgs = { inherit inputs; };
+  home-manager.extraSpecialArgs = { inherit inputs; inherit unstable; };
   home-manager.users.sandydoo = import "${inputs.self}/users/sandydoo/home.nix";
 
   users.mutableUsers = false;
diff --git a/users/sandydoo/home.nix b/users/sandydoo/home.nix
index bf4ea47..8fda812 100644
--- a/users/sandydoo/home.nix
+++ b/users/sandydoo/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ pkgs, lib, inputs, unstable, ... }:
 
 with lib.hm.gvariant;
 
@@ -11,7 +11,7 @@ with lib.hm.gvariant;
 
   home.packages = with pkgs; [
     # Editors
-    neovim
+    unstable.neovim
     kakoune
     helix