diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 596131e..2d40b9f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up PDM
         uses: pdm-project/setup-pdm@v3
         with:
-          python-version: 3.12
+          python-version: 3.13
       - name: Cache Nox Virtualenvs
         uses: actions/cache@v1
         with:
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v1
       - name: Set up PDM
diff --git a/Makefile b/Makefile
index a20e980..9d2d6d9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ help:
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
 
-PYTHON = 3.11
+PYTHON = 3.13
 EXTRAS = parser
 DEV_EXTRAS = test docs
 EXTRAS_ARGS = $(if $(EXTRAS),-G,) $(subst $(SPACE),$(SPACE)-G$(SPACE),$(EXTRAS))
diff --git a/default.nix b/default.nix
index 0571473..631a6b8 100644
--- a/default.nix
+++ b/default.nix
@@ -7,11 +7,6 @@
     dream2nix.modules.dream2nix.WIP-python-pdm
   ];
 
-  deps = {nixpkgs, ...}: {
-    pkgs = nixpkgs;
-    python = nixpkgs.python3;
-  };
-
   mkDerivation = {
     src = lib.cleanSourceWith {
       src = lib.cleanSource ./.;
diff --git a/flake.lock b/flake.lock
index 3a7c8e9..1a98d30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "pyproject-nix": "pyproject-nix"
       },
       "locked": {
-        "lastModified": 1728499310,
-        "narHash": "sha256-6qa+IU6PaQa/swQ9wRn4J1pFprundzruJiV0aTDou/Q=",
+        "lastModified": 1728585693,
+        "narHash": "sha256-rhx5SYpIkPu7d+rjF9FGGBVxS0BwAEkmYIsJg2a3E20=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "586ff3bb752711bbf6d54475295f0da98ead5ee4",
+        "rev": "c6935471f7e1a9e190aaa9ac9823dca34e00d92a",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728409405,
-        "narHash": "sha256-kk530XBUGDpt0DQbyUb3yDpSddPqF9PA5KTo/nsmmg0=",
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1366d1af8f58325602280e43ed6233849fb92216",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7a5c3bd..f1193a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,9 +16,13 @@
       "x86_64-linux"
     ];
   in {
-    packages = eachSystem (system: {
+    packages = eachSystem (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+      };
+    in {
       default = dream2nix.lib.evalModules {
-        packageSets.nixpkgs = nixpkgs.legacyPackages.${system};
+        packageSets.nixpkgs = pkgs;
         modules = [
           ./default.nix
           {
@@ -34,15 +38,16 @@
     in {
       default = pkgs.mkShell {
         inputsFrom = [self.packages.${system}.default.devShell];
-        buildInputs = with pkgs; [
+
+        packages = with pkgs; [
+          pre-commit
+          python3Packages.nox
+
           python39
           python310
           python311
           python312
-        ];
-        packages = with pkgs; [
-          pre-commit
-          python312Packages.nox
+          python313
         ];
       };
     });
diff --git a/noxfile.py b/noxfile.py
index 4dcba41..9f35f4c 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -13,7 +13,7 @@
 
 nox.options.stop_on_first_error = True
 
-pythons = ["3.9", "3.10", "3.11", "3.12"]
+pythons = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 os.environ.update({"PDM_IGNORE_SAVED_PYTHON": "1"})
 os.environ.pop("PYTHONPATH", None)
diff --git a/pyproject.toml b/pyproject.toml
index c717d2a..6ae65e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,6 +12,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Development Status :: 5 - Production/Stable",
   "Operating System :: POSIX",
   "Operating System :: MacOS :: MacOS X",
@@ -54,6 +55,3 @@ version = { use_scm = true }
 docs = ["sphinx~=7.4", "livereload ~= 2.6", "lark ~= 1.2", "tornado>=6.3.2"]
 test = ["pytest-cov ~= 5.0", "pytest ~= 8.0", "pexpect ~= 4.8", "sybil ~= 8.0"]
 build_readme = ["pygments ~= 2.8", "docutils >= 0.16"]
-
-[tool.pdm.options]
-lock = ["-S", "inherit_metadata,no_cross_platform"]