diff --git a/flake.nix b/flake.nix
index 40a62d2..4ec8141 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,6 @@
     flake-parts.lib.mkFlake { inherit inputs; } ({
       imports = [
         inputs.clan-core.flakeModules.default
-        inputs.nix-topology.flakeModule
 
         ./clanServices/flake-module.nix
         ./devShells/flake-module.nix
@@ -29,12 +28,6 @@
         "aarch64-linux"
       ];
 
-      perSystem = _: {
-        topology.modules = [
-          ./topology.nix
-        ];
-      };
-
       flake = {
         packages.aarch64-linux.genepi-installer-sd-image = nixos-generators.nixosGenerate {
           specialArgs = {
@@ -83,9 +76,6 @@
     ignis.url = "github:ignis-sh/ignis";
     ignis.inputs.nixpkgs.follows = "nixpkgs";
 
-    nix-topology.url = "github:oddlama/nix-topology";
-    nix-topology.inputs.nixpkgs.follows = "nixpkgs";
-
     matugen.url = "github:InioX/Matugen";
     matugen.inputs.nixpkgs.follows = "nixpkgs";
 
diff --git a/machines/crocus/configuration.nix b/machines/crocus/configuration.nix
index 153d99e..67f1a73 100644
--- a/machines/crocus/configuration.nix
+++ b/machines/crocus/configuration.nix
@@ -5,10 +5,10 @@
 {
   imports = [
     # ./radicle.nix
-    ../../system
+    ../../system/core
+    ../../system/nix
     ../../modules/remote-builder.nix
     ./nextcloud.nix
-    ./topology.nix
     ../../modules/unbound.nix
     ../../modules/unbound-auth.nix
     self.nixosModules.gitea
diff --git a/machines/crocus/topology.nix b/machines/crocus/topology.nix
deleted file mode 100644
index d658870..0000000
--- a/machines/crocus/topology.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  topology.self = {
-    hardware.info = "x86_64 VPS";
-    interfaces = {
-      tailscale0 = {
-        type = "wireguard";
-        network = "tailscale";
-      };
-    };
-  };
-}
diff --git a/machines/genepi/configuration.nix b/machines/genepi/configuration.nix
index 23fdcf6..8ceb500 100644
--- a/machines/genepi/configuration.nix
+++ b/machines/genepi/configuration.nix
@@ -18,7 +18,6 @@
     ./pinchflat.nix
     ./syncthing.nix
     ./taskchampion.nix
-    ./topology.nix
 
     ../../modules/acme-home.nix
     ../../modules/lounge.nix
diff --git a/machines/genepi/topology.nix b/machines/genepi/topology.nix
deleted file mode 100644
index 184608a..0000000
--- a/machines/genepi/topology.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, ... }:
-let
-  inherit (config.lib.topology)
-    mkConnection
-    ;
-in
-{
-  topology.self = {
-    hardware.info = "Raspberry Pi 4B";
-    interfaces = {
-      tailscale0 = {
-        type = "wireguard";
-        network = "tailscale";
-      };
-      enp1s0 = {
-        type = "ethernet";
-        network = "home";
-        physicalConnections = [
-          (mkConnection "cassoulet" "eth1")
-        ];
-      };
-    };
-  };
-}
diff --git a/machines/haze/configuration.nix b/machines/haze/configuration.nix
index 272a1a7..1aecf89 100644
--- a/machines/haze/configuration.nix
+++ b/machines/haze/configuration.nix
@@ -17,7 +17,6 @@
     ./thunderbird.nix
     ./network.nix
     ./syncthing.nix
-    ./topology.nix
     ./video.nix
     ../../system
 
diff --git a/machines/haze/topology.nix b/machines/haze/topology.nix
deleted file mode 100644
index 8a2990a..0000000
--- a/machines/haze/topology.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  topology.self = {
-    hardware.info = "VivoBook Laptop";
-    interfaces = {
-      tailscale0 = {
-        type = "wireguard";
-        network = "tailscale";
-        virtual = true;
-      };
-    };
-  };
-}
diff --git a/system/network/default.nix b/system/network/default.nix
index 5b74a30..2abc273 100644
--- a/system/network/default.nix
+++ b/system/network/default.nix
@@ -1,7 +1,6 @@
 { self, ... }:
 {
   imports = [
-    self.inputs.nix-topology.nixosModules.default
     ./tailscale.nix
   ];
 }
diff --git a/topology.nix b/topology.nix
deleted file mode 100644
index bd2d18b..0000000
--- a/topology.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, ... }:
-let
-  inherit (config.lib.topology)
-    mkConnection
-    mkInternet
-    mkRouter
-    ;
-in
-{
-  nodes.internet = mkInternet {
-    connections = [
-      (mkConnection "cassoulet" "wan1")
-      (mkConnection "crocus" "enp1s0")
-    ];
-  };
-
-  nodes.cassoulet = mkRouter "Cassoulet" {
-    info = "BBox Fibre";
-    interfaceGroups = [
-      [ "wan1" ]
-      [
-        "eth1"
-        "eth2"
-        "eth3"
-        "eth4"
-      ]
-    ];
-  };
-
-  networks.home = {
-    name = "Home Network";
-    cidrv4 = "192.168.1.1/24";
-  };
-
-  networks.tailscale = {
-    name = "Tailscale";
-    cidrv4 = "100.100.181.10/32";
-    cidrv6 = "fd7a:115c:a1e0::2401:b50a/128";
-  };
-}