[mo] switch to fork with more fixes