diff --git a/hosts/amahl/system.scm b/hosts/amahl/system.scm
index ddfc731..da8b07e 100644
--- a/hosts/amahl/system.scm
+++ b/hosts/amahl/system.scm
@@ -76,11 +76,24 @@
      (service dhcp-client-service-type
               (dhcp-client-configuration (interfaces '("eth0"))))
 
+     (service tor-service-type
+              (tor-configuration
+                (hidden-services
+                  (list
+                    (tor-onion-service-configuration
+                      (name "nginx")
+                      (mapping '((80 "127.0.0.1:8080"))))))))
+
      (service nginx-service-type
               (nginx-configuration
                (extra-content "autoindex on;")
                (server-blocks
-                (list (nginx-server-configuration
+                (list
+                  (nginx-server-configuration
+                       (listen '("127.0.0.1:8080"))
+                       (server-name (list "*.onion"))
+                       (root (string-append "/srv/http/" domain)))
+                  (nginx-server-configuration
                        (listen '("443 ssl"))
                        (server-name (list domain))
                        (ssl-certificate