diff --git a/flake.lock b/flake.lock
index c07358d1..5389c4da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -146,7 +146,9 @@
     },
     "microvm": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixos"
         ]
@@ -475,6 +477,7 @@
     "root": {
       "inputs": {
         "fenix": "fenix",
+        "flake-utils": "flake-utils",
         "heliwatch": "heliwatch",
         "hydra": "hydra",
         "hydra-ca": "hydra-ca",
@@ -602,7 +605,9 @@
         "nixpkgs": [
           "nixos"
         ],
-        "utils": "utils_2"
+        "utils": [
+          "flake-utils"
+        ]
       },
       "locked": {
         "lastModified": 1657495218,
@@ -649,21 +654,6 @@
         "type": "github"
       }
     },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "yammat": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index be6c015a..ec2008ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
       url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixos";
     };
+    flake-utils.url = "github:numtide/flake-utils";
     heliwatch = {
       url = "git+https://gitea.c3d2.de/astro/heliwatch.git";
       inputs = {
@@ -24,7 +25,10 @@
     hydra-ca.url = "github:mlabs-haskell/hydra/aciceri/ca-derivations";
     microvm = {
       url = "github:astro/microvm.nix";
-      inputs.nixpkgs.follows = "nixos";
+      inputs = {
+        nixpkgs.follows = "nixos";
+        flake-utils.follows = "flake-utils";
+      };
     };
     naersk = {
       url = "github:nix-community/naersk";
@@ -45,6 +49,10 @@
         openwrt.follows = "openwrt";
       };
     };
+    riscv64 = {
+      url = "github:zhaofengli/nixos-riscv64";
+      inputs.nixpkgs.follows = "nixos";
+    };
     scrapers = {
       url = "git+https://gitea.c3d2.de/astro/scrapers.git";
       flake = false;
@@ -72,6 +80,7 @@
         fenix.follows = "fenix";
         naersk.follows = "naersk";
         nixpkgs.follows = "nixos";
+        utils.follows = "flake-utils";
       };
     };
     tigger = {
@@ -91,10 +100,6 @@
         openwrt-imagebuilder.follows = "openwrt-imagebuilder";
       };
     };
-    riscv64 = {
-      url = "github:zhaofengli/nixos-riscv64";
-      inputs.nixpkgs.follows = "nixos";
-    };
   };
 
   outputs = inputs@{ self, nixos-unstable, nixos, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, oparl-scraper, ... }: