diff --git a/flake.nix b/flake.nix
index 0e51153..0d3c7fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,7 @@
     inputs:
     with inputs;
     let
+      getSystem = pkgs: pkgs.stdenv.hostPlatform.system;
       getPackages = builtins.attrValues;
       forAllSystems =
         function: nixpkgs.lib.genAttrs (import systems) (system: function nixpkgs.legacyPackages.${system});
@@ -38,7 +39,7 @@
     {
       devShells = forAllSystems (pkgs: {
         default = pkgs.mkShell {
-          packages = with deps.${pkgs.system}; build ++ dev;
+          packages = with deps.${getSystem pkgs}; build ++ dev;
           RUST_SRC_DIR = "${pkgs.rustPlatform.rustLibSrc}";
           RUST_LOG = "debug";
           shellHook = ''
@@ -48,21 +49,21 @@
       });
 
       packages = forAllSystems (pkgs: {
-        unstable = deps.${pkgs.system}.naersk.buildPackage {
+        unstable = deps.${getSystem pkgs}.naersk.buildPackage {
           src = ./.;
           preConfigure = ''
             cp -R ${niri} niri/
           '';
           meta.mainProgram = "niri-tag";
         };
-        stable = deps.${pkgs.system}.naersk.buildPackage {
+        stable = deps.${getSystem pkgs}.naersk.buildPackage {
           src = ./.;
-          preBuild = ''
+          preConfigure = ''
             cp -R ${niri} niri/
           '';
           meta.mainProgram = "niri-tag";
         };
-        default = self.packages.${pkgs.system}.unstable;
+        default = self.packages.${getSystem pkgs}.unstable;
       });
 
       nixosModules.default = self.nixosModules.niri-tag;
@@ -72,7 +73,7 @@
           imports = [
             ./module.nix
           ];
-          services.niri-tag.package = self.packages.${pkgs.system}.unstable;
+          services.niri-tag.package = self.packages.${getSystem pkgs}.unstable;
         };
 
     };