diff --git a/flake.lock b/flake.lock
index 1d990173..215136cb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -452,11 +452,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1664628729,
-        "narHash": "sha256-A1J0ZPhBfZZiWI6ipjKJ8+RpMllzOMu/An/8Tk3t4oo=",
+        "lastModified": 1665321371,
+        "narHash": "sha256-0SO6MTW0bX6lxZmz1AZW/Xmk+hnTd7/hp1vF7Tp7jg0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "3024c67a2e9a35450558426c42e7419ab37efd95",
+        "rev": "236ba4df714131059945d7754c0aa3fbe9d2f74c",
         "type": "github"
       },
       "original": {
@@ -627,26 +627,6 @@
         "type": "github"
       }
     },
-    "riscv64": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1647822145,
-        "narHash": "sha256-hN9oOPwR/mhUnhG2YLywUDFE51SpyBC8O8IOFSVPqbU=",
-        "owner": "zhaofengli",
-        "repo": "nixos-riscv64",
-        "rev": "f0b105b7671289c3fc17849532afe4fceb95bfd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "repo": "nixos-riscv64",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "affection-src": "affection-src",
@@ -669,7 +649,6 @@
         "oparl-scraper": "oparl-scraper",
         "openwrt": "openwrt",
         "openwrt-imagebuilder": "openwrt-imagebuilder",
-        "riscv64": "riscv64",
         "rust-overlay": "rust-overlay",
         "scrapers": "scrapers",
         "secrets": "secrets",
diff --git a/flake.nix b/flake.nix
index 58260a6d..2bb4dcae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,10 +86,6 @@
         nixpkgs.follows = "nixos";
       };
     };
-    riscv64 = {
-      url = "github:zhaofengli/nixos-riscv64";
-      inputs.nixpkgs.follows = "nixos";
-    };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs = {
@@ -171,7 +167,7 @@
     };
   };
 
-  outputs = inputs@{ self, eris, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-unstable, oparl-scraper, riscv64, scrapers, secrets, sshlogd, sops-nix, spacemsg, syndicate, ticker, tigger, yammat, zentralwerk, ... }:
+  outputs = inputs@{ self, eris, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-unstable, oparl-scraper, scrapers, secrets, sshlogd, sops-nix, spacemsg, syndicate, ticker, tigger, yammat, zentralwerk, ... }:
     let
       inherit (nixos) lib;
       forAllSystems = lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
@@ -907,7 +903,7 @@
 
         riscbert = nixosSystem' {
           modules = [
-            riscv64.nixosModules.visionfive
+            nixos-hardware.nixosModules.starfive-visionfive-v1
             ./hosts/riscbert
             { nixpkgs.crossSystem.config = "riscv64-unknown-linux-gnu"; }
           ];