diff --git a/system/nixos/configuration.nix b/system/nixos/configuration.nix
index d024f53..884fc74 100644
--- a/system/nixos/configuration.nix
+++ b/system/nixos/configuration.nix
@@ -1,6 +1,8 @@
 { inputs, pkgs, system }:
 
 let
+  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${system}";
+
   configure-gtk = pkgs.writeTextFile {
     name = "configure-gtk";
     destination = "/bin/configure-gtk";
@@ -181,7 +183,7 @@ in
         monospace = [ "JetBrainsMono Nerd Font Mono" ];
       };
     };
-    fonts = with inputs.nixpkgs-unstable.legacyPackages."${system}"; [
+    fonts = with pkgsUnstable; [
       (nerdfonts.override {
         fonts = [
           "FiraCode"
diff --git a/system/shared/home-manager-packages.nix b/system/shared/home-manager-packages.nix
index d658ab5..292a2ad 100644
--- a/system/shared/home-manager-packages.nix
+++ b/system/shared/home-manager-packages.nix
@@ -1,4 +1,7 @@
 { inputs, pkgs, ... }:
+let
+  pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
+in
 with pkgs; [
   awscli2
   bottom
@@ -18,12 +21,12 @@ with pkgs; [
   go
   htop
   inotify-tools
-  inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
   jq
   just
   lua
   mysql
   neofetch
+  pkgsUnstable.rustywind
   pv
   ripgrep
   terraform