diff --git a/flake.lock b/flake.lock
index 279a033..3a5f303 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -69,7 +54,6 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap"
diff --git a/flake.nix b/flake.nix
index 971413d..53cfaff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,12 +13,12 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-for-bootstrap, home-manager, flake-utils }:
+  outputs = { self, nixpkgs, nixpkgs-for-bootstrap, home-manager }:
     let
+      forEachSystem = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
+
       overlay = nixpkgs.lib.composeManyExtensions (import ./overlays);
 
       pkgs' = import nixpkgs {
@@ -26,8 +26,9 @@
         overlays = [ overlay ];
       };
 
-      app = flake-utils.lib.mkApp {
-        drv = pkgs'.callPackage ./nix-on-droid { };
+      app = {
+        type = "app";
+        program = "${pkgs'.callPackage ./nix-on-droid { }}/bin/nix-on-droid";
       };
     in
     {
@@ -36,6 +37,8 @@
         nix-on-droid = app;
       };
 
+      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
+
       lib.nixOnDroidConfiguration =
         { config
         , system ? "aarch64-linux"  # unused, only supported variant
@@ -54,6 +57,21 @@
 
       overlays.default = overlay;
 
+      packages = forEachSystem (system:
+        (import ./pkgs {
+          inherit system;
+          nixpkgs = nixpkgs-for-bootstrap;
+        }).customPkgs
+        // {
+          fakedroid = import ./tests {
+            inherit system;
+            nixpkgs = nixpkgs-for-bootstrap;
+          };
+
+          nix-on-droid = nixpkgs.legacyPackages.${system}.callPackage ./nix-on-droid { };
+        }
+      );
+
       templates = {
         default = self.templates.minimal;
 
@@ -72,22 +90,5 @@
           description = "Advanced example of nix-on-droid system config with home-manager.";
         };
       };
-    }
-    // flake-utils.lib.eachSystem [ "aarch64-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" ] (system: {
-      formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
-
-      packages =
-        (import ./pkgs {
-          inherit system;
-          nixpkgs = nixpkgs-for-bootstrap;
-        }).customPkgs
-        // {
-          fakedroid = import ./tests {
-            inherit system;
-            nixpkgs = nixpkgs-for-bootstrap;
-          };
-
-          nix-on-droid = nixpkgs.legacyPackages.${system}.callPackage ./nix-on-droid { };
-        };
-    });
+    };
 }