diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
index f41e2b8a..6a5f83a6 100644
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -44,8 +44,10 @@
               <package name="" withSubpackages="true" static="false" />
             </value>
           </option>
+          <!-- Should be a superset of https://github.com/google/error-prone/blob/c481b3f9c2da112db36ccfcbf64e755261a127ab/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java#L63 -->
           <DO_NOT_IMPORT_INNER>
             <CLASS name="Builder" />
+            <CLASS name="BuilderFactory" />
             <CLASS name="Callback" />
             <CLASS name="Class" />
             <CLASS name="Entry" />
@@ -54,6 +56,7 @@
             <CLASS name="Type" />
             <CLASS name="Key" />
             <CLASS name="Id" />
+            <CLASS name="Identifier" />
             <CLASS name="Provider" />
           </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>
diff --git a/build.gradle b/build.gradle
index 2aa4d701..91167690 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.27.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.4.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.1.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.183.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.184.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.12.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'