diff --git a/makefile b/makefile
index 5aea98b..02f4c35 100644
--- a/makefile
+++ b/makefile
@@ -68,7 +68,7 @@ SERVER_SRC := \
 	containers/src/std/experimental/allocator/package.d\
 	containers/src/std/experimental/allocator/common.d\
 	containers/src/std/experimental/allocator/gc_allocator.d\
-	containers/src/std/experimental/allocator/allocator_list.d\
+	containers/src/std/experimental/allocator/building_blocks/allocator_list.d\
 	containers/src/std/experimental/allocator/typed.d\
 	containers/src/memory/allocators.d\
 	containers/src/memory/appender.d\
diff --git a/src/server/server.d b/src/server/server.d
index 826b1b7..206e424 100644
--- a/src/server/server.d
+++ b/src/server/server.d
@@ -29,6 +29,7 @@ import std.process;
 import std.datetime;
 import std.conv;
 import std.experimental.allocator;
+import std.experimental.allocator.mallocator;
 import std.exception : enforce;
 import std.experimental.logger;
 
@@ -108,8 +109,8 @@ int main(string[] args)
 	cache.addImportPaths(importPaths);
 	infof("Import directories:\n    %-(%s\n    %)", cache.getImportPaths());
 
-	ubyte[] buffer = cast(ubyte[]) Mallocator.it.allocate(1024 * 1024 * 4); // 4 megabytes should be enough for anybody...
-	scope(exit) Mallocator.it.deallocate(buffer);
+	ubyte[] buffer = cast(ubyte[]) Mallocator.instance.allocate(1024 * 1024 * 4); // 4 megabytes should be enough for anybody...
+	scope(exit) Mallocator.instance.deallocate(buffer);
 
 	sw.stop();
 	info(cache.symbolsAllocated, " symbols cached.");