diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7814637b..1423533b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,7 +32,7 @@ repos:
     files: 'lib/esbonio-extensions/.*\.py'
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: 'v1.15.0'
+  rev: 'v1.16.1'
   hooks:
   - id: mypy
     name: mypy (scripts)
diff --git a/Makefile b/Makefile
index dcb3caa2..b87b7d9d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 include .devcontainer/tools.mk
 
-.PHONY: lint enable-pre-commit disable-pre-commit
+.PHONY: lint
+lint: $(UVX)
+	$(UVX) pre-commit run --all-files
 
-lint: $(PRE_COMMIT)
-	$(PRE_COMMIT) run --all-files
+.PHONY: enable-pre-commit
+enable-pre-commit: $(UVX)
+	$(UVX) pre-commit install
 
-
-enable-pre-commit: $(PRE_COMMIT)
-	$(PRE_COMMIT) install
-
-disable-pre-commit: $(PRE_COMMIT)
-	$(PRE_COMMIT) uninstall
+.PHONY: disable-pre-commit
+disable-pre-commit: $(UVX)
+	$(UVX) pre-commit uninstall
diff --git a/lib/esbonio/esbonio/server/_configuration.py b/lib/esbonio/esbonio/server/_configuration.py
index b51c5934..8863618d 100644
--- a/lib/esbonio/esbonio/server/_configuration.py
+++ b/lib/esbonio/esbonio/server/_configuration.py
@@ -15,7 +15,7 @@
 
 from . import Uri
 
-T = TypeVar("T")
+T = TypeVar("T", bound=attrs.AttrsInstance)
 
 if typing.TYPE_CHECKING:
     from collections.abc import Awaitable
@@ -91,7 +91,7 @@ def scope_fs_path(self) -> str | None:
         uri = Uri.parse(self.scope)
         return uri.fs_path
 
-    def expand(self, config: attrs.AttrsInstance) -> attrs.AttrsInstance:
+    def expand(self, config: T) -> T:
         """Expand any configuration variables in the given config value."""
         for name in attrs.fields_dict(type(config)):
             value = getattr(config, name)