diff --git a/flake.nix b/flake.nix
index e1051375..6d603827 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,7 @@
         inputs
         // {
           inherit system;
+          inputs = inputs';
         };
     in
       import nixpkgs {
diff --git a/modules/riscv.nix b/modules/riscv.nix
index 1921b384..d126f584 100644
--- a/modules/riscv.nix
+++ b/modules/riscv.nix
@@ -2,11 +2,11 @@
   system,
   riscv-overlay,
   ...
-}: {
-  nixpkgs.overlays =
-    if system == "riscv64-linux"
-    then [
-      riscv-overlay.overlays.default
-    ]
-    else [];
+}:
+if system == "riscv64-linux"
+then {
+  nixpkgs.overlays = [
+    riscv-overlay.overlays.default
+  ];
 }
+else {}