Fix Action: add IDs everywhere

Fixes #217. This is a cherry-pick from the refactoring branch.