amami: changed repos to omni's and update cherry-peeks