diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
index ef5379c..d1b044b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
@@ -302,7 +302,7 @@
   public Account.Id getContextUserId() throws ConfigInvalidException {
     int contextUserId = getConfig().getInt("global", "contextUserId", -1);
     if (contextUserId > 0) {
-      return new Account.Id(contextUserId);
+      return Account.id(contextUserId);
     }
     return user.get().getAccountId();
   }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
index d07fded..4920df3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
@@ -251,7 +251,7 @@
   @Test
   public void getContextUserIdTest() throws Exception {
     defaultSetup("context_user.config");
-    assertThat(configLoader.getContextUserId()).isEqualTo(new Account.Id(102304));
+    assertThat(configLoader.getContextUserId()).isEqualTo(Account.id(102304));
   }
 
   @Test