diff --git a/lib/mksystem.nix b/lib/mksystem.nix
index ae79ba5..343d922 100644
--- a/lib/mksystem.nix
+++ b/lib/mksystem.nix
@@ -23,10 +23,11 @@
     if darwin
     then ../modules/cli/darwin.nix
     else ../modules/cli;
+
+  specialArgs = inputs // {inherit system;};
 in
   systemFunc {
-    inherit system;
-    specialArgs = inputs;
+    inherit system specialArgs;
     modules =
       [
         overlays
@@ -63,7 +64,7 @@ in
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            extraSpecialArgs = inputs;
+            extraSpecialArgs = specialArgs;
             users.${user} = {
               imports = [
                 ../modules/cli/home.nix
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
index b6caba2..8f4931e 100644
--- a/modules/gui/default.nix
+++ b/modules/gui/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   zen,
+  system,
   ...
 }: let
   # When editing this, don't forget to edit home.sessionVariables.
@@ -19,7 +20,7 @@ in {
   home.packages = with pkgs; [
     google-chrome
     firefox
-    (import zen {system = "x86_64-linux";}).zen-browser
+    (import zen {system = system;}).zen-browser
     vesktop
     mpv
     xdg-utils
diff --git a/modules/gui/ghostty.nix b/modules/gui/ghostty.nix
index 0ca45ea..ef0fdfd 100644
--- a/modules/gui/ghostty.nix
+++ b/modules/gui/ghostty.nix
@@ -1,5 +1,5 @@
-{ghostty, ...}: let
-  pkg = ghostty.packages.x86_64-linux.default;
+{ghostty, system, ...}: let
+  pkg = ghostty.packages.${system}.default;
 in {
   xdg.configFile."ghostty/config".source = ./ghostty.config;
 
diff --git a/modules/wm/ags/default.nix b/modules/wm/ags/default.nix
index d4f60e5..3128e17 100644
--- a/modules/wm/ags/default.nix
+++ b/modules/wm/ags/default.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   astal,
+  system,
   ...
 }: let
   covercolors = pkgs.stdenv.mkDerivation {
@@ -21,7 +22,7 @@
       prev.buildInputs
       ++ [
         pkgs.libdbusmenu-gtk3
-        astal.packages.x86_64-linux.river
+        astal.packages.${system}.river
       ];
   });
 in {