diff --git a/machines/universedesktop/configuration.nix b/machines/universedesktop/configuration.nix
index bb4235e..8872f9d 100644
--- a/machines/universedesktop/configuration.nix
+++ b/machines/universedesktop/configuration.nix
@@ -34,6 +34,9 @@
 
         # ccache, y'know for blenders and whatnots
         ./ccache.nix
+
+        # So we can run riscv 'natively'
+        ./riscv.nix
       ];
 
     fileSystems."/home/universe/tmp" = {
diff --git a/machines/universedesktop/riscv.nix b/machines/universedesktop/riscv.nix
new file mode 100644
index 0000000..7e634dd
--- /dev/null
+++ b/machines/universedesktop/riscv.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, lib, ... }: {
+  boot.binfmt.emulatedSystems = [
+    "riscv64-linux"
+  ];
+  boot.binfmt.preferStaticEmulators = true;
+}