diff --git a/flake.nix b/flake.nix
index a13ad680..b3104913 100644
--- a/flake.nix
+++ b/flake.nix
@@ -178,11 +178,11 @@
           systems' = {
             not522 = {
               config = ./machine/not522;
-              system = "riscv64-linux";
+              system = "x86_64-linux";
             };
             not522-installer = {
               config = ./machine/not522/installer;
-              system = "riscv64-linux";
+              system = "x86_64-linux";
             };
             oracle-installer = {
               config = ./machine/oracle-installer;
@@ -264,7 +264,7 @@
           })
           [
             "x86_64-linux"
-            "riscv64-linux"
+            #"riscv64-linux"
             "aarch64-linux"
           ]
       );
diff --git a/machine/not522/default.nix b/machine/not522/default.nix
index ea3af0f9..dba4639f 100644
--- a/machine/not522/default.nix
+++ b/machine/not522/default.nix
@@ -9,7 +9,7 @@
     "${nixos-config}/config"
     ./disko.nix
     ./hardware.nix
-    ./cross-packages.nix
+    #./cross-packages.nix
     "${nixpkgs}/nixos/modules/profiles/minimal.nix"
   ];
   system.stateVersion = "24.11";
@@ -18,4 +18,8 @@
     "native-riscv"
     "big-parallel"
   ];
+  nixpkgs.crossSystem = {
+    config = "riscv64-unknown-linux-gnu";
+    system = "riscv64-linux";
+  };
 }
diff --git a/machine/not522/installer/default.nix b/machine/not522/installer/default.nix
index 05809852..7d88dfd2 100644
--- a/machine/not522/installer/default.nix
+++ b/machine/not522/installer/default.nix
@@ -27,4 +27,8 @@
     '')
   ];
   isInstaller = true;
+  nixpkgs.crossSystem = {
+    config = "riscv64-unknown-linux-gnu";
+    system = "riscv64-linux";
+  };
 }