You could run an upsert command for each type as stated above and then you’d have a <type>.xid predicate for each of your types.
However, the more practical approach would be to continue using xid as your upsertPredicate and expect each type to have an xid predicate (without the type prefix).