diff --git a/bolt.bend b/bolt.bend
index 2d48f79..998a717 100644
--- a/bolt.bend
+++ b/bolt.bend
@@ -26,3 +26,11 @@ def wrap() -> String:
 # a pure def named by no law
 def laws() -> String:
   "error"
+
+# bolt 1.8.0 closed: warn until the findings are fixed (see the tracking issue)
+def closed() -> String:
+  "warn"
+
+# bolt 1.8.0 coverage: warn until the findings are fixed (see the tracking issue)
+def coverage() -> String:
+  "warn"
diff --git a/ez.lock.toml b/ez.lock.toml
index 833e267..308f2c0 100644
--- a/ez.lock.toml
+++ b/ez.lock.toml
@@ -20,3 +20,11 @@ LICENSE = "309f5aae946e4db157750e002fb179a74ed0fe27fce09a7be68a6977b14f205f"
 "src/print.bend" = "32a92e32f9e58cb028c59209c6aeb2b408f0510d199b31cff172c09bbb68fd6a"
 "src/pull.bend" = "c682f4f968f78b10bf39351130aa48fc9ade47c01f5bb2b4b74a061df7afb141"
 "src/value.bend" = "e4fe80f757464b9c35e298b921c1a6562e4e9251c779774b0d8873f46129e8e7"
+
+[tools.bolt]
+git = "https://github.com/Emerging-Patterns/bolt"
+rev = "02fb09377f5c0fbddb5f6b7c32c8ab4ae14240df"
+tag = "v1.8.0"
+root = "."
+narHash = "sha256-53zE+3lZ/jn9GvIeGoavvNMaFyUs5dEFWd7fwP49TlM="
+entry = "main.bend"
diff --git a/ez.toml b/ez.toml
index 269d14b..6d0f999 100644
--- a/ez.toml
+++ b/ez.toml
@@ -10,3 +10,11 @@ tag = "v1.1.0"
 root = "."
 narHash = "sha256-yHxl1aW4luf2bdPqOUcULhOEZLlcaTOWjTrPJys4CMI="
 entry = "main.bend"
+
+[tools.bolt]
+git = "https://github.com/Emerging-Patterns/bolt"
+rev = "02fb09377f5c0fbddb5f6b7c32c8ab4ae14240df"
+tag = "v1.8.0"
+root = "."
+narHash = "sha256-53zE+3lZ/jn9GvIeGoavvNMaFyUs5dEFWd7fwP49TlM="
+entry = "main.bend"
diff --git a/flake.lock b/flake.lock
index a4c6ea2..a8b2a35 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790013287,
-        "narHash": "sha256-Yr/1J0Wn0Q0xkmPwJk2eOyCrqMgOymZu1Np2FKoVRMQ=",
+        "lastModified": 1790348040,
+        "narHash": "sha256-6oh+6jj7kyl4xJsmq4p3BtU/BUl2f2LlC/5kH081D1M=",
         "owner": "bendlang",
         "repo": "bend",
-        "rev": "a49524265bdfa5753a4bf38e25f0574a705dd868",
+        "rev": "774ef644dccf9c3f8053f7276d8901ad23da006c",
         "type": "github"
       },
       "original": {
@@ -20,56 +20,7 @@
         "type": "github"
       }
     },
-    "bolt": {
-      "inputs": {
-        "bend": [
-          "bend"
-        ],
-        "ez": "ez",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1790052105,
-        "narHash": "sha256-n5cZkkv9uScR4U6obhcpxBJOz2Qijt1LyVCDIk3SPhA=",
-        "owner": "Emerging-Patterns",
-        "repo": "bolt",
-        "rev": "1085266c5d531c2798c21b965043ebe01800b1c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Emerging-Patterns",
-        "repo": "bolt",
-        "type": "github"
-      }
-    },
     "ez": {
-      "inputs": {
-        "bend": [
-          "bolt",
-          "bend"
-        ],
-        "nixpkgs": [
-          "bolt",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1790028674,
-        "narHash": "sha256-0cSIKVwoxmsJIlk3BpRVoLzB0nPjqBq+asPZZ5k6sIM=",
-        "owner": "Emerging-Patterns",
-        "repo": "ez",
-        "rev": "62aa63305cde7294cc6a15b540d392adcda1d9a7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Emerging-Patterns",
-        "repo": "ez",
-        "type": "github"
-      }
-    },
-    "ez_2": {
       "inputs": {
         "bend": [
           "bend"
@@ -79,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790078157,
-        "narHash": "sha256-k8kxqfxggOyKbm616eopFqyIgmzubI91MmkthXTO7yQ=",
+        "lastModified": 1790310127,
+        "narHash": "sha256-csxvWEjzbSOTuXxWcKbyfBrHMXru2JkA2u3oO1AH5MU=",
         "owner": "Emerging-Patterns",
         "repo": "ez",
-        "rev": "f009e42434ba18da71755fc0d3886c3c999469eb",
+        "rev": "836aa9c0a4f9a53a7d8e15e80a8451c58eb03503",
         "type": "github"
       },
       "original": {
@@ -111,8 +62,7 @@
     "root": {
       "inputs": {
         "bend": "bend",
-        "bolt": "bolt",
-        "ez": "ez_2",
+        "ez": "ez",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 739b2a6..ce0153e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,11 +11,6 @@
     inputs.nixpkgs.follows = "nixpkgs";
     inputs.bend.follows = "bend";
   };
-  inputs.bolt = {
-    url = "github:Emerging-Patterns/bolt";
-    inputs.nixpkgs.follows = "nixpkgs";
-    inputs.bend.follows = "bend";
-  };
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
@@ -25,7 +20,7 @@
       ez = inputs.ez.lib.${system};
       ezBin = inputs.ez.packages.${system}.default;
       bend = inputs.bend.packages.${system}.default;
-      bolt = inputs.bolt.packages.${system}.default;
+      bolt = ez.toolPackage { name = "bolt"; src = self; inherit bend; wrapFlags = [ "--gpu" "off" ]; };
       bend-cc = ez.bend-cc;
 
       bench = import ./bench {
@@ -43,15 +38,15 @@
 
       checks.${system} = {
         proofs = ez.mkProofs { ez = ezBin; src = self; };
-        lint = ez.mkLint { inherit bolt; src = self; };
+        lint = ez.mkLint { src = self; };
       } // bench.checks;
 
       devShells.${system}.default = ez.mkShell {
+        src = self;
         packages = [
           bend
           bend-cc
           ezBin
-          bolt
           pkgs.openssl
           pkgs.cacert
           pkgs.python3