diff --git a/selftest/knownfail b/selftest/knownfail
index cdcc8e1feac..397e53c1f08 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -286,4 +286,3 @@
 ^samba4.krb5.kdc.*as-req-aes.*fl2000dc
 # nt4_member and ad_member don't support ntlmv1
 ^samba3.blackbox.smbclient_auth.plain.*_member.*option=clientntlmv2auth=no.member.creds.*as.user
-^samba4.drs.rpc.msDSIntId.*msDSIntId.Schema
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index a992c098250..2568f0efa9e 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -482,7 +482,7 @@ static WERROR get_nc_changes_add_la(TALLOC_CTX *mem_ctx,
 			return WERR_OK;
 		}
 	}
-	la->attid = sa->attributeID_id;
+	la->attid = dsdb_attribute_get_attid(sa, false);
 	la->flags = active?DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE:0;
 
 	status = dsdb_get_extended_dn_uint32(dsdb_dn->dn, &la->meta_data.version, "RMD_VERSION");