Draft: Stop hard-coding simplified unit IDs for wired-in packages

This is needed for #20647 (closed), and also something we perhaps want anyways, as somewhat discussed in #20742 (closed).

I expect this first draft to fail miserably, but that will tell us what we need to do.