diff --git a/flake.nix b/flake.nix
index 76bf2d9..9599441 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,15 +8,6 @@
 
   outputs =
     inputs@{ flake-parts, home-manager, nixpkgs, nixpkgs-unstable, self, ... }:
-    let
-      system = "x86_64-linux";
-
-      specialArgs = {
-        pkgs-unstable = import nixpkgs-unstable {
-          inherit inputs system;
-        };
-      };
-    in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [ "x86_64-linux" ];
 
@@ -29,15 +20,13 @@
       flake = {
         nixosConfigurations = {
           nixedo = nixpkgs.lib.nixosSystem {
-            inherit specialArgs;
-
             modules = [
               ./system/nixos/nixedo/configuration.nix
 
               home-manager.nixosModules.home-manager
               {
                 home-manager = {
-                  extraSpecialArgs = specialArgs;
+                  extraSpecialArgs = { inherit inputs; };
                   useGlobalPkgs = true;
                   useUserPackages = true;
                   users.opdavies = import ./home-manager/nixedo.nix;
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index ce1cec9..65ef55f 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
+{ inputs, lib, pkgs, ... }:
 
 let
   vim-astro = pkgs.vimUtils.buildVimPlugin {
@@ -75,7 +75,7 @@ in
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [ "postman" ];
 
-  home.packages = (import ./home-manager-packages.nix) { inherit pkgs pkgs-unstable; };
+  home.packages = (import ./home-manager-packages.nix) { inherit inputs pkgs; };
 
   home.file."nodemon.json".text = ''
     {
@@ -164,10 +164,10 @@ in
       vimPlugins.nvim-treesitter-textobjects
 
       # LSP
+      inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.lsp-zero-nvim
+      inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.nvim-lspconfig
       vimPlugins.null-ls-nvim
       vimPlugins.lsp-status-nvim
-      pkgs-unstable.vimPlugins.lsp-zero-nvim
-      pkgs-unstable.vimPlugins.nvim-lspconfig
 
       # Completion
       vimPlugins.cmp-buffer
@@ -211,6 +211,7 @@ in
 
       # Language servers
       ansible-language-server
+      inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
       lua53Packages.lua-lsp
       nodePackages.intelephense
       nodePackages."@astrojs/language-server"
@@ -224,7 +225,6 @@ in
       nodePackages.vue-language-server
       nodePackages.yaml-language-server
       phpactor
-      pkgs-unstable.nixd
       rnix-lsp
       terraform-ls
 
diff --git a/home-manager/modules/home-manager-packages.nix b/home-manager/modules/home-manager-packages.nix
index 6ad1e2b..60d35e3 100644
--- a/home-manager/modules/home-manager-packages.nix
+++ b/home-manager/modules/home-manager-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, ... }:
+{ inputs, pkgs, ... }:
 
 with pkgs; [
   awscli2
@@ -18,6 +18,7 @@ with pkgs; [
   gnupg
   htop
   inotify-tools
+  inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
   jq
   just
   lua
@@ -35,7 +36,6 @@ with pkgs; [
   php81Packages.phpcs
   php81Packages.phpstan
   pinentry
-  pkgs-unstable.rustywind
   platformsh
   postman
   pulumi-bin
diff --git a/home-manager/nixedo.nix b/home-manager/nixedo.nix
index 01dfc78..28a141a 100644
--- a/home-manager/nixedo.nix
+++ b/home-manager/nixedo.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [