diff --git a/Main.cc b/Main.cc
index 92515a95..fcaf83a9 100644
--- a/Main.cc
+++ b/Main.cc
@@ -239,7 +239,7 @@ int main(int argc, char* argv[]) {
   }
 
   log(INFO, "loading configuration");
-  auto config_json = JSONObject::load("system/config.json");
+  auto config_json = JSONObject::parse(load_file("system/config.json"));
   populate_state_from_config(state, config_json);
 
   shared_ptr<DNSServer> dns_server;
diff --git a/Makefile b/Makefile
index 488512d7..66c1e4cb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ OBJECTS=FileContentsCache.o Menu.o PSOProtocol.o Client.o Lobby.o \
 	LevelTable.o Compression.o Quest.o RareItemSet.o Map.o NetworkAddresses.o \
 	Text.o DNSServer.o ProxyServer.o Shell.o ServerShell.o ProxyShell.o Main.o
 CXX=g++
-CXXFLAGS=-I/opt/local/include -I/usr/local/include -std=c++14 -g -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H -Wall -Werror
-LDFLAGS=-L/opt/local/lib -L/usr/local/lib -std=c++14 -levent -levent_pthreads -lphosg -lpthread
+CXXFLAGS=-I/opt/local/include -I/usr/local/include -std=c++20 -g -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H -Wall -Werror
+LDFLAGS=-L/opt/local/lib -L/usr/local/lib -std=c++20 -levent -levent_pthreads -lphosg -lpthread
 
 all: newserv