diff --git a/flake.lock b/flake.lock
index 171fdbb..0a6ec56 100644
--- a/flake.lock
+++ b/flake.lock
@@ -63,24 +63,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakeCompat": {
       "flake": false,
       "locked": {
@@ -247,20 +229,19 @@
     },
     "utils": {
       "inputs": {
-        "flake-utils": "flake-utils_2"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1696281284,
-        "narHash": "sha256-xcmtTmoiiAOSk4abifbtqVZk0iwBcqJfg47iUbkwhcE=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "6cf1e312fb259693c4930d07ca3cbe1d07ef4a48",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
-        "owner": "gytis-ivaskevicius",
-        "ref": "v1.4.0",
-        "repo": "flake-utils-plus",
+        "owner": "numtide",
+        "repo": "flake-utils",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 489b2d5..94f509a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
+    utils.url = "github:numtide/flake-utils";
     nil.url = "github:oxalica/nil";
     yants.url = "github:divnix/yants";
     alejandra = {
@@ -20,24 +20,25 @@
     yants,
     ...
   } @ inputs: let
-    versionFile = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./VERSION);
+    inherit (builtins) readFile replaceStrings;
+    fu = utils.lib;
+    versionFile = replaceStrings ["\n"] [""] (readFile ./VERSION);
+    version =
+      if self.sourceInfo ? dirtyShortRev
+      then "${versionFile}-${self.sourceInfo.dirtyShortRev}"
+      else versionFile;
 
-    version = if self.sourceInfo ? dirtyShortRev
-    then "${versionFile}-${self.sourceInfo.dirtyShortRev}"
-    else versionFile;
-  in
-    utils.lib.mkFlake {
-      inherit self inputs;
-      outputsBuilder = channel: let
-        system = channel.nixpkgs.system;
-      in {
-        formatter = alejandra.defaultPackage.${channel.nixpkgs.system};
-        devShells.default = import ./shell.nix {
-          pkgs = channel.nixpkgs;
-          inherit (inputs.nil.packages.${system}) nil;
-        };
+    forSystem = system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+      formatter = alejandra.defaultPackage.${system};
+      inherit (inputs.nil.packages.${system}) nil;
+    in {
+      inherit formatter;
+      devShells.default = import ./shell.nix {
+        inherit pkgs nil;
       };
-
-      lib = import ./lib {inherit version yants;};
     };
+  in
+    (fu.eachDefaultSystem forSystem)
+    // {lib = import ./lib {inherit version yants;};};
 }