diff --git a/flake.nix b/flake.nix
index 6b0498d..fa70603 100755
--- a/flake.nix
+++ b/flake.nix
@@ -85,7 +85,6 @@
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
-          system = "x86_64-linux";
         };
         modules = [
           ./hosts/demeter
@@ -95,7 +94,6 @@
       callisto = nixpkgs.lib.nixosSystem {
         specialArgs = {
           inherit inputs;
-          system = "aarch64-linux";
         };
         modules = [
           ./hosts/callisto
@@ -104,7 +102,6 @@
       adrastea = nixpkgs.lib.nixosSystem {
         specialArgs = {
           inherit inputs;
-          system = "x86_64-linux";
         };
         modules = [
           ./hosts/adrastea
diff --git a/hosts/demeter/home-manager-extras/default.nix b/hosts/demeter/home-manager-extras/default.nix
index 21ee92e..5a9488f 100644
--- a/hosts/demeter/home-manager-extras/default.nix
+++ b/hosts/demeter/home-manager-extras/default.nix
@@ -1,8 +1,8 @@
 {
   inputs,
-  system,
+  pkgs,
   ...
 }: {
   wayland.windowManager.hyprland.settings.monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
-  wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${system}.hyprland;
+  wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${pkgs.system}.hyprland;
 }
diff --git a/modules/linux/core/default.nix b/modules/linux/core/default.nix
index 829c178..4aefbe8 100644
--- a/modules/linux/core/default.nix
+++ b/modules/linux/core/default.nix
@@ -1,10 +1,10 @@
 {
   inputs,
-  system,
+  pkgs,
   ...
 }: {
   environment.systemPackages = [
-    inputs.personal-neovim.packages.${system}.default
+    inputs.personal-neovim.packages.${pkgs.system}.default
   ];
 
   security.sudo.enable = false;