diff --git a/flake.nix b/flake.nix
index 88e478f..0342bfe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
     nixos-unstable.url = "github:NixOS/nixpkgs/master";
     local-unstable.url = "path:///home/giulio/dev/nixpkgs";
+    teslamate-flake.url = "github:teslamate-org/teslamate/v1.31.1";
     home-manager = {
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,7 +14,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixos-unstable, local-unstable, home-manager, nvidia-patch }:
+  outputs = { self, nixpkgs, nixos-unstable, local-unstable, home-manager, teslamate-flake, nvidia-patch }:
     let
       sysLinuxX64 = "x86_64-linux";
       sysDarwin = "aarch64-darwin";
@@ -44,13 +45,19 @@
             overlays = extOverlays;
           };
 
+          teslamatePkgs = import teslamate-flake {
+            inherit system config;
+            overlays = extOverlays;
+          };
+
           overlays = [
             (final: prev: { inherit unstablePkgs; })
             (final: prev: { inherit localPkgs; })
+            (final: prev: { inherit teslamatePkgs; })
           ] ++ extOverlays;
         };
 
-      wrapUtils = { pkgs, system }:
+      wrapUtils = { pkgs }:
         let
           inherit (pkgs.lib) makeScope;
           inherit (pkgs) newScope;
@@ -66,13 +73,13 @@
 
 
       pkgsLinuxX64Cuda = wrapPkgsSystem { system = sysLinuxX64; };
-      utilsLinuxX64Cuda = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64Cuda; };
+      utilsLinuxX64Cuda = wrapUtils { pkgs = pkgsLinuxX64Cuda; };
 
       pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
-      utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; };
+      utilsLinuxAarch = wrapUtils { pkgs = pkgsLinuxAarch; };
 
       pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
-      utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; };
+      utilsDarwin = wrapUtils { pkgs = pkgsDarwin; };
     in
     {
       nixosConfigurations = {
@@ -82,6 +89,9 @@
             user = "giulio";
             roles = [ ];
           }];
+          imports = [
+            teslamate-flake.nixosModules.default
+          ];
         };
       };