diff --git a/paris-container.nix b/paris-container.nix
index 9793a25..2bd379e 100644
--- a/paris-container.nix
+++ b/paris-container.nix
@@ -2,9 +2,12 @@
 
 with lib;
 let
+  cfg = config.fudo.paris-container;
+
+  packages = with pkgs; [ rtorrent ];
 
 in {
-  options = {
+  options.fudo.paris-container = {
     enable = mkEnableOption "Enable Fudo Paris user server.";
 
     state-directory = mkOption {
@@ -69,11 +72,11 @@ in {
       config = {
         nixpkgs.pkgs = pkgs;
 
-        environment.systemPackages = with pkgs; [ rtorrent ];
+        environment.systemPackages = packages;
 
         networking = {
           defaultGateway = {
-            address = getSiteGatewayV4 siteName;
+            address = config.networking.defaultGateway.address;
             interface = "mv-${cfg.networking.interface}";
           };
           enableIPv6 = !isNull cfg.networking.ipv6;