diff --git a/flake.lock b/flake.lock
index 5f0e180..784cc96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1767281941,
-        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
+        "lastModified": 1769069492,
+        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
+        "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1768158989,
-        "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
+        "lastModified": 1769691507,
+        "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
+        "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 865b7ca..914d26a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,20 +22,10 @@
         "aarch64-darwin"
       ];
 
-      imports = [
-        git-hooks.flakeModule
-        treefmt-nix.flakeModule
-      ];
-
       perSystem =
-        {
-          config,
-          pkgs,
-          ...
-        }:
-        {
-          # Treefmt configuration for formatting
-          treefmt = {
+        { pkgs, system, ... }:
+        let
+          treefmtEval = treefmt-nix.lib.evalModule pkgs {
             projectRootFile = "flake.nix";
             programs = {
               nixfmt.enable = true;
@@ -62,10 +52,9 @@
             };
           };
 
-          # Git hooks configuration
-          pre-commit = {
-            check.enable = false; # Skip check in flake (ty needs Python env)
-            settings.hooks = {
+          pre-commit-check = git-hooks.lib.${system}.run {
+            src = ./.;
+            hooks = {
               gitleaks = {
                 enable = true;
                 name = "gitleaks";
@@ -75,7 +64,7 @@
               };
               treefmt = {
                 enable = true;
-                package = config.treefmt.build.wrapper;
+                package = treefmtEval.config.build.wrapper;
               };
               ty = {
                 enable = true;
@@ -87,6 +76,9 @@
               };
             };
           };
+        in
+        {
+          formatter = treefmtEval.config.build.wrapper;
 
           devShells.default = pkgs.mkShellNoCC {
             buildInputs = with pkgs; [
@@ -120,7 +112,7 @@
               fi
 
               # Install git hooks
-              ${config.pre-commit.installationScript}
+              ${pre-commit-check.shellHook}
             '';
           };
         };